Finally figured out how to set up the services correctly.

Change-Id: I6a3122e36d61e56b35cd6d5e5118d212c3f755d1