fix(amazonq): address rebase conflicts with mainline

[Hweinstock]

Problem

There were some outstanding build issues from the latest auto-merge.

Solution

• Address these by manually looking at the diff here: master...feature/ui-e2e-tests.

---

• Treat all work as PUBLIC. Private feature/x branches will not be squash-merged at release time.
• Your code changes must meet the guidelines in CONTRIBUTING.md.
• License: I confirm that my contribution is made under the terms of the Apache 2.0 license.

[github-actions]

• This pull request modifies code in src/* but no tests were added/updated.
  • Confirm whether tests should be added or ensure the PR description explains why tests are not required.

[surajrdy-aws]

Looks good to me!