Merge "Snap for 8952093 from 11b1061d834666a605e7a02fe757341ef224a04d to sdk-release" into sdk-release