Merge "Update EMBMS test app/service with method"