Optimize 'noservices' condition

Change-Id: I8f823143065ebd518a3acad2902089aecc3a5436
2 files changed