getService: try getting service before waiting
am: 3ae9bf951b

Change-Id: I680f3b28fdd989e613ae8ed97465bfac6a5c4ffe