Merge "Make a11y node info parceling more robust" into nyc-dev am: ce5c8cb6b8 am: 3241198caa
am: 9ff56373ff

Change-Id: I53855b4dc3bba60226751fdaaaa722636c226486