Ethiopia drops charges against 7, including Gerba