Merge "Update GSI bug component ID" into main