Merge "Fix snapshot publish"