Merge "Snap for 9570125 from 57a935613c39fa8cd02d7dec5c68a992fbbccc4d to sdk-release" into sdk-release