Merge commit 'f2feb0faa266e5e0844c20a8adb9cdb5f360322f' into eclair-mr2-plus-aosp * commit 'f2feb0faa266e5e0844c20a8adb9cdb5f360322f': Fix invalidate code path (#2273209).
Merge commit 'f2feb0faa266e5e0844c20a8adb9cdb5f360322f' into eclair-mr2-plus-aosp * commit 'f2feb0faa266e5e0844c20a8adb9cdb5f360322f': Fix invalidate code path (#2273209).