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