1. Make changes after upgrade from 4.3 to 5.0 caused issues (https://github.com/bazelbuild/bazel/commit/7007bed70f112cbc75a8ad47492a28c78c042326)
2. Add 'team-OSS' to the list
3. Some clean up

PiperOrigin-RevId: 597608249
Change-Id: I1994002ef10e797d2979fbc97c2df54fd3dd8c83