Merge "Fix extra problem in embms testapps" am: 5f089601dd am: be7d612eb3
am: 497dd57177

Change-Id: I89cff49febd90153717439f9d4b2ae17dde92fea