am 80315372: am 90731574: Merge "Adjust timestamp scale" into jb-mr2-dev

* commit '80315372d833e472bc129c83838896d649f9c74b':
  Adjust timestamp scale