Merge "Add setting to disable assist data (1/2)" into mnc-dev