Merge "Snap for 9550355 from a20f29ea78981603c007510d8778cd5aa14337fd to sdk-release" into sdk-release