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

Change-Id: I12ead2e4ef5b01c37e5c7583e7f188f08ce3ca3c