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

* commit 'b07d3c48ea7dcb5bb41c8f5d93b23ac6c42b15dc':
  Adjust timestamp scale