Convert over other services

Change-Id: I0297ae2c1b6ef37c173322a3d0cb82680cd3c42f