DO NOT MERGE: fix for the XPath nodeTab use-after-free bug from nmehta@ am: 01ad0c65b5 am: 6321519b3b
am: 6188da583e  -s ours

Change-Id: Ib20a9229fe7acb4f59e5fe1aa3d6d3638104ec49