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

* commit '07cf9445a4afebf82cc1b9a0e44bc9aced51e0a0':
  Replace hand written offsets with structures.