Merge "Snap for 11637895 from 4e1e221a63069c179ae47a9f9183b4b49823bb7f to sdk-release" into sdk-release