Merge remote-tracking branch 'origin/upstream/master' into 'main'

Change-Id: I56188b14e86967e80de4be7e6e5e9dccd69bd0dc