Revert "Cleanup getService" am: 5f009cbdba
am: 5c53135064

Change-Id: Ieaf77cd9eaf6b0f1fbf3736b9fe3ecf683d98ce5