Merge "Emergency API review" am: 69cfbfcc7b
am: cb774f48fe

Change-Id: I60b9073c558e5de68d99dbfcdd5127b3b9b723c2