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

Change-Id: I80adc11fae6eb7ed72c1f304a560e2a5c9f93108