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