Merge "Snap for 11762235 from 13a4c86d116c907c23b99774c06134dd9742eef9 to sdk-release" into sdk-release