Merge "Snap for 11871564 from 13ed94458e82368c78a17cd6c9aa23e557cde9a4 to sdk-release" into sdk-release