Merge "Snap for 6660490 from cc8d17fefc8516ddbef28093cac248e2e60a0f28 to sdk-release" into sdk-release