Merge "Add null check in a11y callback" into oc-mr1-dev am: 4dfeb4f0e4
am: 0e8e7830fc

Change-Id: I88c8d335a4b91072d5e9bfcc4c2a7b21ec46565b