Merge "Revert path for service instance"