Merge "Make shutdown logging thread-safe" into oc-mr1-dev
am: 9328cb9fdf

Change-Id: I862810d4b0f13180e1126db1fdd90e9adf539d9c