Merge branch 'upstream/master' into main

Change-Id: Id6f67665a9ee7f90cf5114727c525727a6c4cb19