am ce9313fa: am 07cf9445: am 0319f528: Merge "Replace hand written offsets with structures."

* commit 'ce9313faed28c5592d03f278611f438ab25dee2d':
  Replace hand written offsets with structures.