Merge "Get server fault if snapshot fails"