Merge "Add bug component id to OWNERS"