Merge "eMBMS API update"
am: 99b21ccb34

Change-Id: Ic459910f1a06979cf8e1813d18400236eeb1ad49