Merge "Update EMBMS test app/service with method" am: 4fc1c3079c am: 199f2ade29 am: 5901a37237
am: 4846c27381

Change-Id: I6620a6745746b579ea4a3775a7faf5ae3be43f7d