Merge "Revert "Fix a11y cache correctness bug"" into pi-dev am: 987ec033ab
am: 24f953a6c2

Change-Id: I38d80cd355ebf044696848d1d4697521cd78183f