Prevent a crash on devices that remove non-core services

Change-Id: Id7fcf0f1f7b6ddec8e860b3c4cde98aec63d04b6
1 file changed