Merge "Snap for 5590969 from ff615a1cce76842139098f5af2c769b1fb6a6972 to sdk-release" into sdk-release