Merge "Snap for 11699450 from 5c5a412b3cff6b1ac349cb1166d490d48ae2f1ff to sdk-release" into sdk-release