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