[automerger skipped] Merge "Emergency API review" am: 69cfbfcc7b am: cb774f48fe
am: e1a3e3802b -s ours
am skip reason: change_id I158874201a7ed8427cfe4ac4c4f39abe01217a37 with SHA1 8c68542613 is in history

Change-Id: Ifc685c99e5853fb560b93dc5c5fe94178b5a87c8