Merge "Add Bug component ID to the OWNER file"