Merge "Merge "CellSignalStrength cleanup" am: af7435ca1f am: 67a2db0a66 am: 252aeb18cb"