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

Change-Id: Idacb1addc15e049a66e54804c48bf0468cc6d327