Merge "Snap for 5475808 from 6450e718148606fbfeabd4a38b3047187bfa643d to sdk-release" into sdk-release