Merge "Add tests to services/tests/net test mapping" am: f4ff6fa293 am: 82a2425dad

Change-Id: I8c03db23b28eb231f352b578ca3faa33d519aed8
tree: 5d15896b116007f62139531f92ce03c72c9ac778
  1. core/
  2. services/
  3. tests/