Merge "Fix test failure caused by verifying obsoleted state"