Revert part of 79eb7ba87bedd88fffa62a13ea9399c2affa1573 am: fd99009c52

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