Merge "Include component ID in OWNERS file"