Merge "Make changes to MBMS API following recs" into pi-dev