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

Change-Id: I8c276bfb184fa7b4ff9b94e08ce74f557ee043ab