Merge commit '48a65d99cba33db3af2e05982a6825b883be2030' into eclair-mr2 * commit '48a65d99cba33db3af2e05982a6825b883be2030': Fix invalidate code path (#2273209).
Merge commit '48a65d99cba33db3af2e05982a6825b883be2030' into eclair-mr2 * commit '48a65d99cba33db3af2e05982a6825b883be2030': Fix invalidate code path (#2273209).