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