Merge "Update EMBMS test app/service with method"
am: 4fc1c3079c

Change-Id: I2f139cf68696db87063c7f12e9af9951d890c77d