Merge "EMBMS test app"
am: 3d8fcd7f1a

Change-Id: I6615baa055355f01a21b0f576eabe6b54496c43b