[automerger skipped] Merge "services.net: Use the new ModuleNetworkStackClient" am: bcd6edb9d6 am: 8ad449dff9 -s ours am: 8d5189d6fb -s ours am: 349bfe3f32 -s ours am: 6a8a3f4d16 -s ours
am skip reason: Change-Id I065525fdbd64b9509ef0f47bb35954d267c65fd2 with SHA-1 1ce72ca363 is in history
Change-Id: I20a22aa0630fea86b55f415af1a1b9a39be0828e
This commit is contained in: