Merge "Snap for 7487883 from 75436afd6114066919795d783c1626131782605a to sdk-release" into sdk-release