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

Change-Id: Ib2f1ddee4a1453b07dbde3282fab5de44be01891