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

Change-Id: I537ffd978b831f3bf47a30e43d4cbbd781c7271f