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

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