Merge "Snap for 11541002 from 1e651e1ef2b613db2c4b29ae59c1de74cf0222ae to sdk-release" into sdk-release