Merge "Allow testing of signal strength" am: 2f46cd181a am: 2e2b52d5d8 am: 1b3fb5fff6 am: 606d1155f7 am: feb8b29445

Change-Id: I47e4a8f1d88b54fe1f0fa4e8d4a729ec36f6365d