Merge "Fix misuse of assertIsNone"