Reenable cirrus for all users that used to have it

Change-Id: I73ae276ecd454bbf7bd2784cae87cdc06cb5304e
Merge "Reenable cirrus for all users that used to have it"