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