Merge "Changes to testapps for EMBMS api tweaks"
am: bac57878da

Change-Id: I33cc4adb066bbc711a6656b1180d591eeb09af3f