Merge "Log SystemServerShutdown earlier" into oc-mr1-dev