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

Change-Id: Icdc462cabbba4b62935a9a62635831ed5f9cb1ec