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

Change-Id: I30b5deb01ed68dc0e235e9997fa147aadb924749