Fix faulty role checks.

Change-Id: Iae973eb77f4a33421261909342fa07e90ec23135