Merge "Fix deadlock in NetworkLoggingHandler" into oc-dev am: ba18b0c683
am: 8954507d8c

Change-Id: I4688c240fbed0e82caf114579ed2e6f5946e0ee0