Merge commit '83086f5abbc84bd3ded576161c1709d0e3611ca4' * commit '83086f5abbc84bd3ded576161c1709d0e3611ca4': Fix invalidate code path (#2273209).
Merge commit '83086f5abbc84bd3ded576161c1709d0e3611ca4' * commit '83086f5abbc84bd3ded576161c1709d0e3611ca4': Fix invalidate code path (#2273209).