Merge "Snap for 11566117 from 3523427b59506918bff93a989655f5f4e49ef6f0 to sdk-release" into sdk-release