Merge "Skip snaphost tests unless snapshot feature is enabled"