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