Merge "Add tests to services/tests/net test mapping" am: 85e73e6099 am: c01a08c3d4 am: 239989c188

Change-Id: Ib4632d4e3a42e56c5c841f4cc13709d91b4cab10