Merge "Snap for 10214594 from aa9650bdc46f27b7dc86804b19e671822f34c6d4 to sdk-release" into sdk-release