Merge "Snap for 8005954 from 6b846b3d5a0e5290fd25f3c6e7e622bc940e6f36 to sdk-release" into sdk-release