Merge "Always use ensure_start to ensure goma's daemon runs"