Merge "Adjust timestamp scale" into jb-mr2-dev