Merge "Snap for 10214594 from 792f44845e375a336f3b60dfeff086e67a335464 to sdk-release" into sdk-release