Fix admin tenant credential

Change-Id: Ie23fc998954a831312d21ca91a315e39c5fd34c2
Merge "Fix admin tenant credential"