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

Change-Id: Ib663cf469da3b1cc5c41b385302db3c107290d23