merge from upstream/master into main at 2022-12-19T22:53:34.439852Z

Change-Id: Ie4f59d210146ef3d46bb7e47dac04f2eec41b5ae