Merge "Snap for 8023979 from b756742520e0b014403874ef19df99974199ac43 to sdk-release" into sdk-release