Merge "Fix a11y cache correctness bug" into pi-dev am: 3fbe56647c
am: 79625e978c

Change-Id: Iaa88b5a060d2acd8e0002461fc8f16208a72621f