Merge "Implement server side playback timestamps with 64 bit accuracy" into nyc-dev
am: c085a757a2

* commit 'c085a757a28f36bdefeee1775fdbdce869c4c1f5':
  Implement server side playback timestamps with 64 bit accuracy