Merge proposals dependent on lp://qastaging/~smspillaz/folly/folly-package

lp://qastaging/~smspillaz/folly/folly-package has no merge proposals.