Merge "Snap for 8023979 from 4421ab3625890951825eb9222054b9261d036891 to sdk-release" into sdk-release