Merge "Snap for 8952093 from 06a9728c3609f856e87db38a6602196cec3ab727 to sdk-release" into sdk-release