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

Change-Id: Ibadc5f3fa1b2cd67998215a132f73bde7f1f4511