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

Change-Id: Id311a9aa8a675691fd68e026a29899c1cb859ac8