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

Change-Id: I739bd920304056c44592f902f1ece6d384ff3bad