Merge "Update roles required for testing"