Merge "Remove flag mDataInjectionMode." into mnc-dev