Merge "Snap for 4499105 from 49c28fe5aa792b7ffecee2741991fd690ff6c78a to sdk-release" into sdk-release