Merge "Snap for 10399941 from 851ab08c673156b37b0983d0a12502629e9e1870 to sdk-release" into sdk-release