Merge "Have InProcessNetworkStack override NetworkStack" into qt-dev
am: 6fe150832e

Change-Id: Ia7e126424f13d3ddd897c506b473f28fe2b6d709