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