Merge "Snap for 11692525 from d0c9098e3cda5fd6755e5ac089077bfc55b03fa6 to sdk-release" into sdk-release