Merge "Include component ID in OWNERS file" into sc-dev