Merge "Update javadocs for API review"
am: bbf2a83826

Change-Id: I5db57219f04829636cb4b9e289c99fa666c3f52d