Change up some system services

Change-Id: Ia8f52f81184144e315642fa63bc942f7d4ce96e9