Revert part of 79eb7ba87bedd88fffa62a13ea9399c2affa1573 am: fd99009c52 am: 3379686f41

Change-Id: Ia7ac2bd617a4185c70eeea6ef1def59d503c8d04
tree: 83b8ccecc3e5629f5d35bb03817df4950fad55bc
  1. service-t/
  2. tests/