Merge "Mainline use cellSignalStrength instead"