Merge "Emergency API review"
am: 853983ef32

Change-Id: Idcfa450fba2e08d825bbe2b95094a7e7f070421b