Moved to using the update 1.8 style of role requirements

Change-Id: I6cc224480e02e1bca9a6d1738681710827000c7e
Merge "Moved to using the update 1.8 style of role requirements"