Merge "Snap for 8144225 from ce784bc8129a45e7212fe0798f6081ad64d26f20 to sdk-release" into sdk-release