Sync changes from develop #3278

✅ All contributors are covered under a CLA with Google

See https://cla.developers.google.com/ for more info about Google's Contributor License Agreement (CLA).

ℹ️ Googlers: Go here to view more details and manage scans for this pull request.

@annuay-google

The following contributors were found for this pull request:

✅ 42d35eb Author: @annuay-google <an***y@google.com>
✅ a2376e2 Author: @mr0re1 <o***v@google.com>
✅ 0470615 Author: @RachaelSTamakloe <rt*****oe@google.com>, <63983467+RachaelSTamakloe@users.noreply.github.com>
✅ 5c357d4 Author: @tpdownes <tp****es@google.com>, <tpdownes@users.noreply.github.com>
✅ 7795d02 Author: @NinaCai <ni****i@google.com>
✅ c7cabaa Author: @alyssa-sm <al****sm@google.com>, <146790241+alyssa-sm@users.noreply.github.com>
✅ a7591a5 Author: @rohitramu <ro***u@google.com>
✅ f7c03ea Author: @ankitkinra <1037624+ankitkinra@users.noreply.github.com>
✅ f8d43f9 Author: @chengcongdu <c**u@google.com>
✅ ec31f78 Author: @abbas1902 <abb******med@google.com>, <69826914+abbas1902@users.noreply.github.com>
✅ e225e8b Author: @harshthakkar01 <har******kar@google.com>
✅ 93487e4 Author: @ighosh98 <indr*******osh@google.com>

(Only the first commit for a unique contributor is listed.)