[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 skip reason: Change-Id I5ff389f3f707e5538979830c2252455bea5bbb88 with SHA-1 e0b336d7 is in history
Change-Id: Ia3619517f3fae625ab7ab2f98645aec5a5ef2671