Merge "Fix RssiMonitoring VTS tests" into oc-dev am: 5c604fc1d4
am: c3191c6c84

Change-Id: I9f41f2db9b511c49f6bcf6d813b59d26e747687c