Merge "CellSignalStrength cleanup"