Merge "Snap for 6877830 from 11c276ec69142d9868f6bd163982427809276e5f to sdk-release" into sdk-release