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

Change-Id: I70e694f5e1adcf382f2ac93ef25aa7298ec9dd52