Implement API review feedback.

bug: 17607941
Change-Id: I136b5d7662a1c51395aa3cd545be40714cd4ac6b
3 files changed