Merge "Remove pre-check for test accounts file in credential factory"