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

Change-Id: I0e499b7d4a549cdb232ba279c5329533b2ffa224