Merge "[automerger skipped] Merge "Emergency API review" am: 853983ef32 am: c6d673901a am: 4e7abb98d1 -s ours am skip reason: change_id I6eb1d8a3ae1625ff3f43f983c488c2969649713b with SHA1 613c3d5826 is in history"