Merge "Allow clearing a single change id for tests usage."