am 4ff78b0b: Merge "Fixing place where offset caches weren\'t being invalidated (issue 5608330)" into ics-mr1

* commit '4ff78b0b1231f9cffdaa17d8747bac7f4561372e':
  Fixing place where offset caches weren't being invalidated (issue 5608330)