Use roles, as per latest Karaage.

Change-Id: Ia7e5e3409ea87e572d14eda2473d81882fc7ef51