merge from upstream/master into main at 2023-01-06T17:07:31.322135Z

Change-Id: I9e1be119c633ffacf577d58b81fc0bf88077a99e