Merge "eMBMS API update" am: 99b21ccb34
am: 6b4841d116

Change-Id: I54ea1661b0d7a341ea94c3a2348d1e6233fd0d80