Merge "Embms API adjustments for 7/21"
am: 489dcb7cca

Change-Id: Ia0b3e9908878c2053c25753b8d393070c2c48a0e