getService: try getting service before waiting
am: 7637124c99

Change-Id: Iadac05bf2af7b7ebbc99b8b3b224eaabafc40635