Merge "Second pass of eMBMS api."
am: c90fcbd660

Change-Id: If77c71951d6514429752fa9c1ba0f8835c7e610b