Merge "Emergency API review" am: 853983ef32
am: c6d673901a

Change-Id: I7d869f5e3ef5b98fb52a429687b4a0875baa835d