[automerger skipped] Merge "Adjust code for API council feedback" am: aab7aca759
am: 85f97bf02a
-s ours
am skip reason: Change-Id I5ff389f3f707e5538979830c2252455bea5bbb88 with SHA-1 e0b336d7a4
is in history
Change-Id: Ifefcbf2672b32a405be4ff6a59f280f8e90b7aa8
This commit is contained in: