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

Change-Id: Ic4bd0af72d5e17ba93faff705938a65a1f871660