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

Change-Id: I56a0c0dc4ddbb3d168c1a386e92158b4a1d2bdde