Merge "Snap for 5234541 from 5837a28eb01e4850268f8d2330d2066f6e90af2e to sdk-release" into sdk-release