[automerger skipped] Merge "Add network stack proto" am: 727f8bbfc6 am: 2fa14ae4c0
am: 16dd607022 -s ours
am skip reason: change_id Iec48037771f2729fcbf741eb1c16edf08dbc70a4 with SHA1 0e88ebfb28 is in history

Change-Id: I46f43baf167e92ea8353d2fd17530909ee7f6c62