[automerger skipped] Merge "Adjust code for API council feedback" am:...
[automerger skipped] Merge "Adjust code for API council feedback" am: aab7aca7 am: 85f97bf0 -s ours am: 57fbcec9 -s ours am: b92b87a5 -s ours
am skip reason: Change-Id I5ff389f3f707e5538979830c2252455bea5bbb88 with SHA-1 e0b336d7 is in history
Change-Id: Ib60831a0f3267343395a71823db3f2e1119d7858