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