getService: try getting service before waiting am: 7637124c99
am: f21e8225c9

Change-Id: I8b8bef17725184b5c1b3cde964d36d8c6510f778