Merge "More fix for 64 bit offset." into honeycomb