[automerger skipped] Merge "Emergency API review" am: 853983ef am: c6d67390
am: 4e7abb98 -s ours
am skip reason: change_id I6eb1d8a3ae1625ff3f43f983c488c2969649713b with SHA1 613c3d58 is in history
Change-Id: Ib082e236265676adebac2649460acd6923eaa2d9