Merge "Generalize rmnet entry for radio properties."