Merge "Snap for 11566117 from 70add21618eed521d09fcdf7814dd04b521c88a5 to sdk-release" into sdk-release