Fix showing Services list based on available images.

Change-Id: Ia7861f56c5ada4c0dd49c37a8ff83c2ccc1bf1f9