Merge "Refactor SignalStrength" am: 0f1bf44c99 am: 77a7e552e6
am: b7d3f47536

Change-Id: Ic6f24455d20452d192302c13f766012bd4e2c70a