Merge "Fix test now that instructions can die at instruction entry."