Address further API review comments

Address further API review comments from API reviewer.

Bug: 31008728
Test: make droid
Change-Id: I0b3f6be9eaf69ffa8a6e73475f9c3a9ba3e343f2
1 file changed