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