Merge "Snap for 11541002 from da399151cc17b2ba06e07f0bc07c07405633a3b9 to sdk-release" into sdk-release