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

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