[automerger skipped] Merge "NetworkStackClient: Refactor network stack process interaction" am: 764a90c200 am: 049c9b40ba -s ours
am: 24b983fde3 -s ours
am skip reason: change_id I673581b0067b9a3f72dd68a3ab622c18183ebd2e with SHA1 b51c428f41 is in history

Change-Id: Ie5b3bc3cb55bd367c30ce23ce191581b7e84ffb9