Merge "Remove failure retry from getService."
am: 7affbd38e1

Change-Id: Ie8668e3f49a17bf903a7a39f7143aa7f2c99766f