Merge "CellSignalStrength cleanup"
am: af7435ca1f

Change-Id: I90cffed716a7bf830862b396597a97d1233e9afd