Update API and javadoc according to API review.

bug:2553570
Change-Id: I0353938f513c119cec0e31eb980dc4569e17d7eb
2 files changed