Merge "Fix admin tenant credential"