Merge "Add network stack proto"
am: 727f8bbfc6

Change-Id: Ic01456c0860e6435f26b1af48359096db6b63224