merge from upstream/master into main at 2023-07-05T10:11:32.265094Z

Change-Id: I4e819d0e016ff727e246cc7c26b06f88a4c2c01f