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

Change-Id: Ib2f6bcda2429346d0418b460bc040fc5e9edbe97