Add gru and gri rebase upstream mappings