Merge "Snap for 9550355 from 87b22603e82b055bb63fd9c759c3f896634fb437 to sdk-release" into sdk-release