Merge "Snap for 7110675 from b76fe0607eabf862ea13fab53e9b6c46d817052f to sdk-release" into sdk-release