Merge "CTS for timestamp in ScanResult" into jb-mr1-dev