Merge "Make changes to MBMS API following recs" into pi-dev
am: 7bedbabd0b

Change-Id: I04bbec845c006659f5ca7eb70e752798a21c2050