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