am 25b18bbd: Merge "Simplify instance reference offsets."

* commit '25b18bbdaa36ff936eb44f228f0518d4223e9d52':
  Simplify instance reference offsets.