am 09d561db: Merge "Fix PTS handling for buffer replacement" into mnc-dev

* commit '09d561dbee9a28db9632ff3d51f633c18aefe023':
  Fix PTS handling for buffer replacement