Merge "EMBMS test app" am: 3d8fcd7f1a
am: b24d2f0d85

Change-Id: I94475218f87c06526f00d7767c81052779eb0add