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

Change-Id: Iebb46fc1a7905d7030d7d0eaa5512ab6bcdc9dac