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

* commit 'a4b0cdc96e309168517f4b4da24b7647668f99a7':
  More fix for 64 bit offset.