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

Change-Id: Ic5caac59332d044e7914a8b28289289f126392ba