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