Merge branch 'upstream-main'

Change-Id: I6e539cc62e3fb47dc4ae17f6f3781a274a16019f