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