Merge "Snap for 7562097 from 21dea4eb3d29cada084fa6a095cd05eaf941def1 to sdk-release" into sdk-release