Merge change I8c5f2fc3 into eclair

* changes:
  Fix invalidate code path (#2273209).