DO NOT MERGE: fix for the XPath nodeTab use-after-free bug from nmehta@ am:...
DO NOT MERGE: fix for the XPath nodeTab use-after-free bug from nmehta@ am: 01ad0c65 am: 6321519b
am: 6188da58 -s ours
Change-Id: Ib20a9229fe7acb4f59e5fe1aa3d6d3638104ec49