am 5659e579: Merge "CTS for timestamp in ScanResult" into jb-mr1-dev

* commit '5659e5795622f2d07f2871408b02839f5807072b':
  CTS for timestamp in ScanResult