Merge "Clean up getService()."
am: e32af4419e

Change-Id: I8275af6fbc39c3cf3b9fb8ed2359eb2faf1217d2