Merge "Move setup to earlier boot phase." into nyc-dev