Merge "Added more logging to diagnose a racy runtime restart." into oc-mr1-dev