Cherry-pick #72

✅ 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.

@eustas

The following contributors were found for this pull request:

✅ 81e958a Committer: @eustas <eu*****ru@gmail.com>
✅ 76f9903 Author: @sboukortt <sb*****tt@google.com>
✅ 3ef0141 Author: @0fbcb238c0 <24275722+0fbcb238c0@users.noreply.github.com>
✅ 679f0e4 Author: @Traneptora <le****en@gmail.com>
✅ 6c4fb6a Author: @jonsneyers <j**@cloudinary.com>
✅ 81e958a Author: @mo271 <fi*****ng@google.com>
✅ 03f1679 Author: @monad0 <damo********send@gmail.com>
✅ 4efb89f Author: @jyrkialakuijala <j***i@google.com>
✅ 28d9fc8 Author: @dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
✅ 2c78a81 Author: @jonnyawsom3 <jon******r30@gmail.com>

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