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

Change-Id: Ib2aaaf46de7a402e34288ea9dcad45b9b2ba55eb