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

Change-Id: Iebcc1abdee8fadec46907f565bd041c4c2cc2856