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