Merge "Snap for 6435660 from 44661705597878d765f1cdb7624d8cb338c58d54 to sdk-release" into sdk-release