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

Change-Id: If39b9bf0833327e9f13e7d39d6704efa2b2e0f96