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