am 113529f0: am a4b0cdc9: Merge "More fix for 64 bit offset." into honeycomb

* commit '113529f062c43b111efbbd1382e23befdd1cdd30':
  More fix for 64 bit offset.