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