am 514e0801: Merge "Fix crash when updating adapter offsets."

* commit '514e0801cc95c9827d220104317e1fe45f396b94':
  Fix crash when updating adapter offsets.