Revert "Cleanup getService"
am: 5f009cbdba

Change-Id: I78bcaed41f48f798562c1be81639133014149581