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

Change-Id: I48d077d7cb4c3dab0a75cef9aec124f0e706d58c