OSTF credentials disabled behavior fix

Closes-Bug:#1348175

Change-Id: I15578a84c574e32eb334543f981d9a1fac692f6e
Merge "OSTF credentials disabled behavior fix"