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

* commit '9fc6948b61d08016dc7dc7db1a28854da8581ea2':
  Fix crash when updating adapter offsets.