Merge "Snap for 5475808 from df4629e947e283e5f2f4d55044f3fad0c56500b3 to sdk-release" into sdk-release