Merge "Snap for 5611628 from 2dca1885039ae9e8f55b7828a503396e6002a1cb to sdk-release" into sdk-release