Merge "Snap for 11566117 from 774b3959e68937eaea006ead8ce075fdebdf3ef2 to sdk-release" into sdk-release