improve check for enabled/disabled modules

Change-Id: I931abc6760c7c6ce051d49a559061ea4086b2d72
Related-Prod: PROD-35792
1 file changed