Merge "Fix crash in a11y cache" into oc-dev
am: 64d6e3e11d

Change-Id: I86b25241a07ab47bc1c7e9a069867db90872ad4f