[automerger skipped] Merge "Fix spacing in NetworkStackClient" am: c53985fc51 -s ours am: 4509978898 -s ours
am: 6f8ec7840b -s ours
am skip reason: change_id I673581b0067b9a3f72dd68a3ab622c18183ebd2e with SHA1 622547b553 is in history

Change-Id: I1f2d26d13291093ffd41afe9f461d61b56ac6fb9