Merge "Add null check to a11y call." into oc-dev
am: 9289faa163

Change-Id: I9e9232a1cef8cd29909233995e983eda98872568