NXIO-158: align on new passivation state pairs