Merge "Fix some java docs." into ics-mr1