merge from upstream/master into main at 2022-12-09T22:53:48.221031Z

Change-Id: If86f94f4be6cc6fa4ac0480a9c894d6c551df158