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

Change-Id: I370bd8804cd24fb3b67160da1e76084abce525cf