Fix ServiceList test. am: c20e35b887
am: 2786fcbfc8

Change-Id: Ic03ce94b2254f986c997dec5adbbe98467e6f92a