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

Change-Id: I74082e88a32ed57ee4030fa072983449005397ce