Merge "EMBMS API tweaks" am: 47e1d11b47 am: 3b40c709a3
am: 2a08ccdd8b

Change-Id: I617e2bca44d52b55f2d032db0fe59aa0a9f88e24