Merge "Emergency API review"
am: 69cfbfcc7b

Change-Id: I15b1ceafcb85e1a767f19cfb11c7ac994a3c90de