Merge "Snap for 8005954 from f8a5acaa27298fbbd10903fe252551ce61ef6e07 to sdk-release" into sdk-release