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