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

Change-Id: I096085f2da8bdde5b53167d25d0beabcb3d491cb