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

Change-Id: I05c71c98dc72c45f31fe3713b408589f7430a7c0