am cbf9e91a: am 1e8a57c2: Merge "Avoid jumps to faulty position after seeks"

* commit 'cbf9e91a5ab186904d3dad21eae416c23ee13668':
  Avoid jumps to faulty position after seeks