Merge "[automerger skipped] Merge "Backport fixes and enable new Dagger Validations" into main am: 3cd9445048 am: 7fe423a15d -s ours" into main