Merge "Add feature flag and EMBMS bug fixes" am: 465f2916e0 am: 3424136a59
am: effcd1f508

Change-Id: Ibefdba1da5da4bfdf93d7db4c0f42a79ad75be46