Revert "Revert "Cleanup getService""
am: 223fd47f10

Change-Id: I2417f88cfabe024ae884c0fa01d5fcd5ca798681