[automerger skipped] Address further API council comments. am: 47ce6894 am:...
[automerger skipped] Address further API council comments. am: 47ce6894 am: 150ebad7 -s ours am: 18ea0a15 -s ours
am skip reason: Change-Id I8a785ae0e74e659c317deaaa28c203356c7766ed with SHA-1 b0e1e7ec is in history
Change-Id: If9d9cb651cb121fb6620929b589a8c02fbc2cefb