merge from upstream/master into main at 2023-01-23T02:14:43.997892Z

Change-Id: If6fa13ebc8a805ef08cfcec001cc2705f48885b0