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

Change-Id: Ib9bddfde5a2577e62a98ec0aa98e15a79548c7a4