[automerger skipped] Merge "Adjust code for API council feedback" am:...
[automerger skipped] Merge "Adjust code for API council feedback" am: 1627d663 am: 1c3f94cb -s ours am: f995ca62 -s ours am: 6a498c2f -s ours
am skip reason: Change-Id Ie0856f6d516096923f5f8b5c7df2965c5f853d08 with SHA-1 8c8ae019 is in history
Change-Id: I04576db94e234c5b09b0eb83250f3406666abcea