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

Change-Id: I01e8084b018fde1365fb0f8778f3e6d53e46bcbe