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

Change-Id: Icc9e80f0f5cafcd6799a387431dcb0409d91a47f