Merge "Snap for 4499105 from ec1edb605d9e6f51682a99402a115ad7245e919f to sdk-release" into sdk-release