Embms API adjustments for 7/21
am: 0bd7a6058c  -s ours

Change-Id: I59b60dd5143294a3833314c04e3747d298277e87