This is for testing. Please ignore

[iancha1992]

Please put the commit IDs (at least first 6 digits of the commit IDs). If multiple, then please separate by commas. Example: 9e90a6, f1da12

98d5d5,79a0dc2, a2b775

Which category does this issue belong to?

team-Bazel, team-Rules-API, team-Rules-Java

Please provide the reviewers of the PR once it is created after cherry-picking. Example: @iancha1992, @keertk

@iancha1992, @Pavank1992

[iancha1992]

Cherry-picked in bazelbuild#19605, which includes the following commit(s): 79a0dc2, a2b775. There was(were) also 1 failed commit(s): 98d5d5 (Cherry-pick was attempted, but there may be merge conflict(s). Please resolve manually.) The failed commit(s) are NOT included in the PR.