Merge "Add network stack proto" am: 727f8bbfc6
am: 2fa14ae4c0

Change-Id: Ia82ff368e705150015be6f9dad8c1f93fa9ec8c7