Merge "ChangeTagsTest: Mark tables as "used" to avoid ID reuse"