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

Change-Id: Id9c95ec4ee347d686b411d7ec8119b62a8ef0fbf