Merge "Snap for 6290619 from 3dccd10bfac7e896533f5bd3405b789d8bd700b9 to sdk-release" into sdk-release