Merge "Fix in isServiceEnabled for credMan Test: Built localy"