DO NOT MERGE: fix for the XPath nodeTab use-after-free bug from nmehta@ am: 01ad0c65 am: 6321519b am: 6188da58 -s ours am: a3da3e0a -s ours am: b8d635fa am: 368f921e -s ours am: 981a28ea Change-Id: Ie42d527ebf020b24c4c30a58643a588158510cd9