Merge "Identity: Use correct component ID."