Merge "Add some network protos to atoms.proto" am: ee9956b386 am: 21b42850d4

Change-Id: Iad26e1312c79c296df2dfca331333cc43ff3a739