Undo previous merge

Change-Id: I7b8b62a8f69a6db551cfef3a5b4bc2de8f97d900
tree: 46a67685311a95c4a5e520f1ef98654534bd3b2f
  1. core/
  2. services/