[automerger skipped] Address further API council comments. am: 17fbd4dc am:...
[automerger skipped] Address further API council comments. am: 17fbd4dc am: 69f2ad71 -s ours am: fbf231a2 -s ours
am skip reason: Change-Id Id23b9d1829a6ef0c38b499d8d864bbd3cdab4562 with SHA-1 14da63c9 is in history
Change-Id: Ia240efd94a819d14825ae9c82ef7a9ee38433b63