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