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

Change-Id: Ia9e0f57efddebe09fb9161c67272e0488eeec840