Merge 'origin/upstream/main' to 'origin/main'

Change-Id: Ic33ce959b0334318b247c5f9dc4372c22389f6d4