Merge "Snap for 7861008 from 52103ef144645ccaa98b0e69e775a80027dbcdf4 to sdk-release" into sdk-release