Merge "Dynamically enable/disable watch for RAT type changes"