Merge "Fix comments on ChangeId."