Merge "Linking Component Id within the Gatekeeper OWNERS file."