DO NOT MERGE: fix for the XPath nodeTab use-after-free bug from nmehta@
am: 01ad0c65b5

Change-Id: Id65ed7dd730d75c676bc4520cafcd23f0aaa2e6a