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

Change-Id: Idcb33dc49c7f93ebbac86c7f8d99c33ecb296cdf