Merge "Make shutdown logging thread-safe" into oc-mr1-dev