Merge "Make ChangeTag use NameTableStore for change_tag_def table"