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 Change-Id: Iaee62692e04360ee167bc78bbe976b70fe73ac00