Merge "Embms adjustments for 7/28" am: 3f6a95e8b0 am: aeb64f7f98
am: 070508ea7a

Change-Id: I51a886a6d30bc4a13fd25fd5d96819353257b5f5