Merge "Make changes to MBMS API following recs"