am 8340c92d: am bb650e8f: am 906befb1: Merge "Fix potential NPE in saveHorizontalOffsets" into klp-dev

* commit '8340c92d31e52222cd9a5bdb806b5b3f72064581':
  Fix potential NPE in saveHorizontalOffsets