Merge "Snap for 5234541 from f852f1e355cbbd42f00f8351678e220379fe643b to sdk-release" into sdk-release