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

Change-Id: I5ef70d2559c89ae6d21864424f35b2b24a0b0eb9