Merge "Ensure the system boots with a halfway sane time/date" into oc-dev