Merge "handle null mScanResult for CTS test" into nyc-dev