Merge "Snap for 6290619 from ed077a7e067d0b8508cf6b7502fa143f841be579 to sdk-release" into sdk-release