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

Change-Id: If6529167138e2d7521179a6b26389752dde6fe45