Merge "Fix extra problem in embms testapps"