Merge "eMBMS API update" am: 99b21ccb34 am: 6b4841d116 am: cfb792830c
am: 5184e5ded2

Change-Id: If9978bbcf26c89171057896356c01f4d376540d9