merge from upstream/master into main at 2023-01-02T17:07:31.180499Z

Change-Id: I283ba924f2a1aedfbe32b5f3f0828b56ba72b47a