Merge "Snap for 7821744 from 2222568acc80e95cb7fcafa63e95778a9d44c6cf to sdk-release" into sdk-release