Merge "Snap for 11541002 from 52095a61ef8bda4beb5eb1861ff81c117681c9c9 to sdk-release" into sdk-release