Cleanup and simplify Tenant "Sudo" Code

Change-Id: I1005a7aba3153ee116dc11e8d9c5d830aac5830e