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
am: b8d635fa9e

Change-Id: Iaee62692e04360ee167bc78bbe976b70fe73ac00