Merge changes from topic "signal-strength-cleanup"
am: fb24180fe0

Change-Id: Iad22d4d91032a87877994bfca00c4f80d11f66c0