Merge "Change defaults for FREQUENCY_RANGE and NR_STATE"