Merge "Uncomment logic for RAT change and add NR State/Frequency"