am a9612acf: am 21a1d72b: Merge "NuPlayer: update timestamp handling" into lmp-dev

* commit 'a9612acf7fd699536ce026297c1b34d877bdbe16':
  NuPlayer: update timestamp handling