Merge "Fix deadlock in NetworkLoggingHandler" into oc-dev