Merge "Snap for 6660490 from b88a97b41ef29524cb3f9e30d21d32618069784e to sdk-release" into sdk-release