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

Change-Id: I433b1e86d0723ba383c0e3be8cde1049a533b079