Merge "Snap for 7183507 from e56b9408bd0e4286b2e1a606bd53960d5f10066e to sdk-release" into sdk-release