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

Change-Id: I2300fe5c9be8a781fea67358c5e1774872b29f7c