Also switch from XT_ to NFT_ constants and update the return type as appropriate. Change-Id: I2ddb88bd9899ac23d3fac6bfdeb38dff5f9d2813