am f984bad9: Merge "Fix PTS handling for buffer replacement"

* commit 'f984bad94aa98f49a3959f3119114e94a547b9bf':
  Fix PTS handling for buffer replacement