Merge "Added more logging to diagnose a racy runtime restart."