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

Change-Id: I4acd0497d32ab5b54663af94a8a8759566328929