Merge "Add logging to NetworkStackClient" am: 969abcc46f am: ab10c4caab
am: 0aa42ed8c1

Change-Id: I7241888c779e8f47161dc2f555e140555134434c