Merge "Embms API adjustments for 7/21" am: 489dcb7cca am: 488d3bf786 am: 7754e25694
am: a7bb0ffc7d

Change-Id: Iab7c397dba3fb446e0c03cd1bab0e82de8172577