[automerger skipped] Merge "services.net: Use the new...
[automerger skipped] Merge "services.net: Use the new ModuleNetworkStackClient" am: fdf46978 am: db85a337 -s ours am: c38f1e6a -s ours
am skip reason: Change-Id I065525fdbd64b9509ef0f47bb35954d267c65fd2 with SHA-1 86a84576 is in history
Change-Id: I12824ac7895c44825aa0c64e972eff7ece8ee877