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

Change-Id: I337bdeba957957414eaad3f981488fc8d8ebbd32