Merge "Snap for 7187421 from fccbc8f53a20edce32b35a9a12bce8224c238be7 to sdk-release" into sdk-release