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

Change-Id: Ie23fae4840c7d944d43a6040d3bb09aa3ccd5b76