Merge "Refactor SignalStrength"
am: 0f1bf44c99

Change-Id: I10042fc89d17e9ef2bc1af8f4fe283c4eb8e4587