Merge "Make a11y node info parceling more robust" into oc-dev
am: ca24a97a15

Change-Id: Ib16dc8e0d61828df63457b90bb3bcc92f6fc033c