Merge "Fix comments on ChangeId." am: 74e47edc82

Change-Id: I4c10072f6d20071cefb08338c9903275ba6ad69e