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

Change-Id: I8c30c1401e97adcb026a25607a737bd336685807