Merge "Add feature flag for MBMS"
am: 3e059193b1

Change-Id: I6712a4c04636272c807d433df841eb16d8f9c0ba