Merge "Snap for 11785460 from 6a78d720796b9b80eec8bff0025ab12c2e9d822c to sdk-release" into sdk-release