Merge "Snap for 11790536 from 2c2625bf05b6d92eedce6c555149fadc5f310de8 to sdk-release" into sdk-release