Merge "Add change ID for platform compat"