Merge "credstore: Never pass an empty challenge."