Replace system_role with system::role in a recent patch.

Change-Id: I80698fef46872196f792989aae982a9f4562a585
Merge "Replace system_role with system::role in a recent patch." into production