Merge "Ensure known good state when starting." into nyc-mr1-dev