Buildtools PR checklist

• [ ] The code in this PR is covered by unit/integration tests.
• [ ] I have tested these changes and provide testing instructions below.
• [ ] I have either responded to, or resolved all Gemini comments on the PR.
• [ ] I have read Google Eng Practices on Small Changes, this PR either follows these guidelines or the description provides reasoning for why they can not be followed.

Description

What does this PR do? Please follow Google Eng Practices - Description

(optional) These changes were tested using the following steps

Steps to reproduce / test the PR changes (if anything besides unit tests).