am 4224dedf: Merge "Adjust timestamp scale" into jb-mr2-dev

* commit '4224dedff0451e0aea3b8f5c3aaf5f2ad0eac1dd':
  Adjust timestamp scale