am 0068e00d: am 91695a0c: Merge "Anti-drift in RCC playback position" into jb-mr2-dev

* commit '0068e00ddc625280ea230ca3fb819e901595c03d':
  Anti-drift in RCC playback position