Merge "Snap for 11724015 from 98e175b6f8467d31566f90a266bffea39234e2ec to sdk-release" into sdk-release