Merge "Allow testing of signal strength" am: 2f46cd181a am: 2e2b52d5d8

Change-Id: Ib00611c70d9b8fc3e4ee5338980344f5e2167fa1