merge from upstream/master into main at 2023-01-25T02:14:43.924465Z

Change-Id: I9b8e917fb9820ba39f3ff9da29c487ab5efb2957