Merge "Snap for 11579193 from e7abebc01d70b7eed93cdadfbbbfe33c32c304b7 to sdk-release" into sdk-release