Merge "Change comment format for ChangeId."