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

Change-Id: Ib405d3d8d2bc723dbddfaca4748bb34fcbae877a