Fix populating device service list for Android