Merge "Allow testing of signal strength" am: 2f46cd18 am: 2e2b52d5 am: 1b3fb5ff am: 606d1155 am: feb8b294 Change-Id: I47e4a8f1d88b54fe1f0fa4e8d4a729ec36f6365d