Merge "Remove support of legacy credential hash"