Merge "Snap for 5925869 from 42c781d54a3185dd24fcf749bbf10bc2ad2ae9b7 to sdk-release" into sdk-release