Merge "EMBMS API tweaks"
am: 47e1d11b47

Change-Id: Ie058b45f2dd09b80a51cb9702155e45f49005173