[automerger skipped] Address further API council comments. am: 4b9a7dd13d am: 7608da3e3a -s ours
am skip reason: Change-Id I7c27f76c54a76abeae46dcdcddaeb3ca48afa358 with SHA-1 dff893b275 is in history
Change-Id: I73c243ccc7e14b895fdf0ab67493ba471b696f50
This commit is contained in: