Merge "Snap for 12890295 from 06d36dc97290469475e0e9658df124ce53d80ce9 to sdk-release" into sdk-release