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 am: 38ae5ff7 am: 4a9e85f6 Change-Id: Iabbe0ea1d1a5de562494246f7ba7bb94fe29e5d7