Changed to ofType
Merge remote-tracking branch 'upstream/rules_proto' into rules_proto