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

Change-Id: I88b9f6fb07b9e7e10bb375d2e8bef968da51c20c