Merge "Rename system_radio_prop"