Merge "Fix NNFI bug with two failing changes at head"