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