Merge "Snap for 5475808 from 88dbaae618521df676cc825c6b9b12a8344fa13e to sdk-release" into sdk-release