Safely check enabled of services

Change-Id: Ibc47efe5fe9840e97b0f1545511e51afc7da728c
Related-PROD: PROD-29652
4 files changed