Bug 565945: cleanup Service, fix dependency resolution, add tests

Change-Id: I592d580ace0074ac5fbf764abec996d0295b727b
24 files changed