[automerger skipped] getService: try getting service before waiting am: 3ae9bf951b am: e10c16e240  -s ours
am: 90d04199c3  -s ours

Change-Id: I38247f7abb89bc99eedcc7beb4dfdb85fdf68364