am 5605e4ab: Merge "Store OnOffsetChangeListener with hard refs" into lmp-mr1-ub-dev

* commit '5605e4ab277499a708ac24149844ef3a37d193ee':
  Store OnOffsetChangeListener with hard refs